iTunes 12 music playback issues

I am running El Cap (10.11.6) on a mid-2010 Macbook Pro with iTunes 12.5.1.21. I recently did an update to iTunes and am now having problems with music playback. Previously when I would open my library in "Album" view, I could double click a song, listen to it and the "Up Next" would be auto-filled with the rest of the songs on that album from that point forward. Since the last update, when I double click a song, it plays, and then the "Up Next" is filled with the rest of the songs in my entire library in alphabetical order by song title. Is there any way I can get back to the previous functionality. The way iTunes is filling the queue currently makes no sense and is rather frustrating. I really don't want to have to make about a thousand play lists to cover all the albums. Help??